static void
check_level_length (GtkTreeModelFilter *filter,
const gchar *level,
- const int length)
+ const int expected_length)
{
if (!level)
{
- int l = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (filter), NULL);
- g_return_if_fail (l == length);
+ int model_length;
+
+ model_length = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (filter), NULL);
+ g_assert_cmpint (model_length, ==, expected_length);
}
else
{
- int l;
+ int model_length;
gboolean retrieved_iter = FALSE;
GtkTreeIter iter;
retrieved_iter = gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (filter),
&iter, level);
g_return_if_fail (retrieved_iter);
- l = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (filter), &iter);
- g_return_if_fail (l == length);
+ model_length = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (filter), &iter);
+ g_assert_cmpint (model_length, ==, expected_length);
}
}